Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 11:47:36 +0000 (11:47 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 11:47:36 +0000 (11:47 +0000)
commit5981ed601504a8c2ea67db72d850f19d87f00374
tree4315c7b29975ff0f7e76d95b57ba8e3aa658aa0b
parent7f5528616c1445cae18b2236f7215e905901ba58
parentd50177712b0bfda5193250333f1019ac921475a9
Merge from mainline.